Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Fri, 29 Jul 2011 05:31:12 +0000 (22:31 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Fri, 29 Jul 2011 05:31:12 +0000 (22:31 -0700)
commit6352ade27c89210b1ae86f24d687f0be510b119f
treed44fec0ae4f49b081edcfd2d2d34690a48773057
parent540b54b241cd031bcea61fa223fafeb55edb9685
parent42d7a191772bb9ba20c2f5bbb2a6682a7e378033
Merge from trunk.
13 files changed:
src/ChangeLog
src/buffer.c
src/callproc.c
src/editfns.c
src/frame.c
src/image.c
src/lread.c
src/nsmenu.m
src/nsterm.h
src/nsterm.m
src/xdisp.c
src/xfaces.c
src/xfns.c